From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 23 Jul 2015 12:49:00 +0000 (+0200)
Subject: keyboard: Don't watch D-Bus services we won't use
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1288
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e63b81d69cb9403426e05e0ce6b46a4b6a8e1531;p=gnome-shell.git

keyboard: Don't watch D-Bus services we won't use

ff1b76f4c7befe5397d5fcf17fa697d70fcc03d1 made gnome-shell stop looking
at the org.gnome.SettingsDaemon.Cursor service's property values, but we
still monitored the service itself.

https://bugzilla.gnome.org/show_bug.cgi?id=752779
---

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 3f356b68a..de1fb21f5 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -24,9 +24,6 @@ const KEYBOARD_TYPE = 'keyboard-type';
 const A11Y_APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';
 const SHOW_KEYBOARD = 'screen-keyboard-enabled';
 
-const CURSOR_BUS_NAME = 'org.gnome.SettingsDaemon.Cursor';
-const CURSOR_OBJECT_PATH = '/org/gnome/SettingsDaemon/Cursor';
-
 const CARIBOU_BUS_NAME = 'org.gnome.Caribou.Daemon';
 const CARIBOU_OBJECT_PATH = '/org/gnome/Caribou/Daemon';
 
@@ -207,9 +204,6 @@ const Keyboard = new Lang.Class({
         this._keyboardSettings.connect('changed', Lang.bind(this, this._sync));
         this._a11yApplicationsSettings = new Gio.Settings({ schema_id: A11Y_APPLICATIONS_SCHEMA });
         this._a11yApplicationsSettings.connect('changed', Lang.bind(this, this._sync));
-        this._watchNameId = Gio.bus_watch_name(Gio.BusType.SESSION, CURSOR_BUS_NAME, 0,
-                                               Lang.bind(this, this._sync),
-                                               Lang.bind(this, this._sync));
         this._daemonProxy = null;
         this._lastDeviceId = null;